From 3d94a9488550a0d1ac955bc91671fb71e85efd29 Mon Sep 17 00:00:00 2001
From: Daniel Pfeiffer <occitan@esperanto.org>
Date: Sun, 2 Jul 2006 19:05:49 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a42c520855..b5fc56255c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-02  Daniel Pfeiffer  <occitan@esperanto.org>
+
+	* progmodes/make-mode.el (makefile-macroassign-regex): Accept
+	preceding keyword.
+	(makefile-gmake-statements): Reorganize, now that makepp has
+	"override" and also handle forgotten "override define".
+	(makefile-makepp-statements): Add new "global", "override export"
+	and "override global".
+
 2006-06-30  Juanma Barranquero  <lekktu@gmail.com>
 
 	* progmodes/ada-mode.el (ada-which-compiler, ada-mode-menu)
-- 
2.30.2